diff --git a/flake-parts/nixos/hosts.nix b/flake-parts/nixos/hosts.nix
index cff4db3..87cf9b3 100644
--- a/flake-parts/nixos/hosts.nix
+++ b/flake-parts/nixos/hosts.nix
@@ -8,7 +8,7 @@
       imports = [
         ../../nixos/profiles/common.nix
         ../../nixos/profiles/linux/base.nix
-        self.nixosModules.nixpkgs-useFlakeNixpkgs
+        self.nixosModules.useFlakeNixpkgs
       ];
 
       nixpkgs.overlays = builtins.attrValues self.overlays;
@@ -18,7 +18,7 @@
     nixosModules.willem-home = {...}: {
       imports = [
         inputs.home-manager.nixosModules.home-manager
-        self.nixosModules.home-manager-integration
+        self.nixosModules.homeManagerIntegration
       ];
       home-manager.users.willem = self.homeManagerModules.user-willem-linux;
     };
@@ -29,8 +29,7 @@
         inputs.home-manager.darwinModules.home-manager
         self.nixosModules.linkNixInputs
         self.nixosModules.home-manager-integration
-        self.nixosModules.nix-useCachix
-        self.nixosModules.nixpkgs-useFlakeNixpkgs
+        self.nixosModules.useFlakeNixpkgs
       ];
 
       nixpkgs.overlays = builtins.attrValues self.overlays;
@@ -82,6 +81,7 @@
         self.darwinModules.base
         ../../nixos/hosts/zeus.darwin.nix
       ];
+      specialArgs = {inherit inputs;};
     };
   };
 }
diff --git a/flake-parts/nixos/modules.nix b/flake-parts/nixos/modules.nix
index 4b99fe5..42a02cc 100644
--- a/flake-parts/nixos/modules.nix
+++ b/flake-parts/nixos/modules.nix
@@ -7,25 +7,13 @@
   inputs,
   ...
 }: {
-  flake.nixosModules = {
-    default = {};
-
-    appleSilicon = {config, ...}: {
-      imports = [inputs.nixos-apple-silicon.nixosModules.apple-silicon-support];
-      nixpkgs.overlays = [inputs.nixos-apple-silicon.overlays.default];
-    };
-
-    nixpkgs-useFlakeNixpkgs = {
-      nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
-      nix.registry.nixpkgs.flake = inputs.nixpkgs;
-    };
-
-    home-manager-integration = {
-      config.home-manager = {
-        useGlobalPkgs = true;
-        useUserPackages = true;
-        backupFileExtension = "bak";
+  flake.nixosModules = let
+    modules = self.lib.importDirToAttrs ../../nixos/modules;
+  in
+    {
+      default = {
+        imports = builtins.attrValues modules;
       };
-    };
-  };
+    }
+    // modules;
 }
diff --git a/nixos/modules/appleSilicon.nix b/nixos/modules/appleSilicon.nix
new file mode 100644
index 0000000..12d4a67
--- /dev/null
+++ b/nixos/modules/appleSilicon.nix
@@ -0,0 +1,4 @@
+{inputs, ...}: {
+  imports = [inputs.nixos-apple-silicon.nixosModules.apple-silicon-support];
+  nixpkgs.overlays = [inputs.nixos-apple-silicon.overlays.default];
+}
diff --git a/nixos/modules/homeManagerIntegration.nix b/nixos/modules/homeManagerIntegration.nix
new file mode 100644
index 0000000..eee08a6
--- /dev/null
+++ b/nixos/modules/homeManagerIntegration.nix
@@ -0,0 +1,7 @@
+{
+  config.home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    backupFileExtension = "bak";
+  };
+}
diff --git a/nixos/modules/useFlakeNixpkgs.nix b/nixos/modules/useFlakeNixpkgs.nix
new file mode 100644
index 0000000..90723f6
--- /dev/null
+++ b/nixos/modules/useFlakeNixpkgs.nix
@@ -0,0 +1,4 @@
+{inputs, ...}: {
+  nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
+  nix.registry.nixpkgs.flake = inputs.nixpkgs;
+}