diff --git a/hosts/default.nix b/hosts/default.nix
index 3c334c3..a245e1c 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -29,30 +29,15 @@
 
       baseNixos = inputs.nixpkgs.lib.nixosSystem {
         modules = [
-          inputs.agenix.nixosModules.age
-          inputs.disko.nixosModules.disko
-          inputs.mailserver.nixosModules.default
-          inputs.home-manager.nixosModules.home-manager
-          inputs.nvidia-patch.nixosModules.nvidia-patch
-          inputs.attic.nixosModules.atticd
-          inputs.lix-module.nixosModules.default
-          self.nixosModules.settei
+          self.nixosModules.combined
           sharedOptions
-          {
-            disabledModules = [
-              "services/networking/atticd.nix"
-            ];
-          }
         ];
         specialArgs.configurationName = "base";
       };
 
       baseDarwin = inputs.darwin.lib.darwinSystem {
         modules = [
-          inputs.agenix.darwinModules.age
-          inputs.home-manager.darwinModules.home-manager
-          inputs.lix-module.nixosModules.default
-          self.darwinModules.settei
+          self.darwinModules.combined
           sharedOptions
         ];
         specialArgs.configurationName = "base";
diff --git a/modules/default.nix b/modules/default.nix
index ac793fe..32f8e5f 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -26,7 +26,24 @@ in
       inherit (config) perInput;
       isLinux = true;
     };
-    default = settei;
+    combined = {
+      imports = [
+        settei
+        inputs.agenix.nixosModules.age
+        inputs.disko.nixosModules.disko
+        inputs.mailserver.nixosModules.default
+        inputs.home-manager.nixosModules.home-manager
+        inputs.nvidia-patch.nixosModules.nvidia-patch
+        inputs.attic.nixosModules.atticd
+        inputs.lix-module.nixosModules.default
+        {
+          disabledModules = [
+            "services/networking/atticd.nix"
+          ];
+        }
+      ];
+    };
+    default = combined;
   };
 
   flake.darwinModules = rec {
@@ -34,6 +51,14 @@ in
       inherit (config) perInput;
       isLinux = false;
     };
-    default = settei;
+    combined = {
+      imports = [
+        settei
+        inputs.agenix.darwinModules.age
+        inputs.home-manager.darwinModules.home-manager
+        inputs.lix-module.nixosModules.default
+      ];
+    };
+    default = combined;
   };
 }