diff --git a/boxes/netbox/default.nix b/boxes/netbox/default.nix
index 8c55069..0afe317 100644
--- a/boxes/netbox/default.nix
+++ b/boxes/netbox/default.nix
@@ -16,6 +16,7 @@
       ./franklincce.nix
       ./wireguard.nix
       ./nextcloud.nix
+      ./mail.nix
     ];
 
   nix = {
diff --git a/boxes/netbox/mail.nix b/boxes/netbox/mail.nix
new file mode 100644
index 0000000..b781924
--- /dev/null
+++ b/boxes/netbox/mail.nix
@@ -0,0 +1,27 @@
+{ inputs, ...}:
+{
+  imports = [
+    inputs.simple-nixos-mailserver.nixosModule
+  ];
+
+  mailserver = {
+    enable = true;
+    fqdn = "mail.beepboop.systems";
+    domains = [ "beepboop.systems" ];
+    loginAccounts = {
+      "ryan@beepboop.systems" = {
+        # nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt' > /hashed/password/file/location
+        hashedPasswordFile = "/etc/ryan-beepboop-systemsuser-pass";
+  
+        aliases = [
+            "info@beepboop.systems"
+            "postmaster@beepboop.systems"
+        ];
+      };
+      "machines@beepboop.systems" = {
+        hashedPasswordFile = "/etc/ryan-beepboop-systemsuser-pass";
+      };
+    };
+    certificateScheme = "acme-nginx";
+  };
+}
diff --git a/flake.nix b/flake.nix
index 907ec21..2923f2f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,29 +21,6 @@
         specialArgs = { inherit inputs; } // { machines = import ./machines.nix; };
         modules = [
           ./boxes/netbox
-          simple-nixos-mailserver.nixosModule
-          {
-            mailserver = {
-              enable = true;
-              fqdn = "mail.beepboop.systems";
-              domains = [ "beepboop.systems" ];
-              loginAccounts = {
-                "ryan@beepboop.systems" = {
-                  # nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt' > /hashed/password/file/location
-                  hashedPasswordFile = "/etc/ryan-beepboop-systemsuser-pass";
-
-                  aliases = [
-                      "info@beepboop.systems"
-                      "postmaster@beepboop.systems"
-                  ];
-                };
-                "machines@beepboop.systems" = {
-                  hashedPasswordFile = "/etc/ryan-beepboop-systemsuser-pass";
-                };
-              };
-              certificateScheme = "acme-nginx";
-            };
-          }
         ];
       };
       copernicus = nixpkgs.lib.nixosSystem {