diff --git a/darwin-modules/.gitkeep b/darwin-modules/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/flake.nix b/flake.nix
index 2d2ec606..80cdefde 100644
--- a/flake.nix
+++ b/flake.nix
@@ -87,7 +87,7 @@
             })
           ])
           ./nixos-common.nix
-      ] ++ [self.nixosModules] ++ extraModules;
+      ] ++ (lib.my.mapModulesRec' (toString ./nixos-modules) import)  ++ extraModules;
     };
     darwinSystem = system: extraModules: hostName:
     let
@@ -108,7 +108,7 @@
             };
           })
         ./darwin-common.nix
-      ] ++ extraModules;
+      ] ++ (lib.my.mapModulesRec' (toString ./darwin-modules) import)  ++ extraModules;
     };
 
     processConfigurations = lib.mapAttrs (n: v: v n);