diff --git a/all-modules.nix b/all-modules.nix
deleted file mode 100644
index 0a9f38e..0000000
--- a/all-modules.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  imports = [
-    ./modules/apps.nix
-    ./modules/checks.nix
-    ./modules/debug.nix
-    ./modules/devShells.nix
-    ./modules/flake.nix
-    ./modules/formatter.nix
-    ./modules/legacyPackages.nix
-    ./modules/moduleWithSystem.nix
-    ./modules/nixosConfigurations.nix
-    ./modules/nixosModules.nix
-    ./modules/nixpkgs.nix
-    ./modules/overlays.nix
-    ./modules/packages.nix
-    ./modules/perSystem.nix
-    ./modules/transposition.nix
-    ./modules/withSystem.nix
-  ];
-}
diff --git a/flake.nix b/flake.nix
index 6a46561..02201cd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,6 +9,7 @@
     let
       lib = import ./lib.nix {
         inherit (nixpkgs-lib) lib;
+        inherit builtinModules extraModules;
         # Extra info for version check message
         revInfo =
           if nixpkgs-lib?rev
@@ -45,8 +46,7 @@
           '';
         };
       };
-      flakeModules = {
-        # Built-in modules
+      builtinModules = {
         apps = ./modules/apps.nix;
         checks = ./modules/checks.nix;
         debug = ./modules/debug.nix;
@@ -63,8 +63,8 @@
         perSystem = ./modules/perSystem.nix;
         transposition = ./modules/transposition.nix;
         withSystem = ./modules/withSystem.nix;
-
-        # Extras
+      };
+      extraModules = {
         easyOverlay = ./extras/easyOverlay.nix;
         flakeModules = ./extras/flakeModules.nix;
         modules = ./extras/modules.nix;
@@ -72,6 +72,7 @@
         bundlers = ./extras/bundlers.nix;
         touchup = ./extras/touchup.nix;
       };
+      flakeModules = builtinModules // extraModules;
     in
     lib.mkFlake { inherit inputs; } {
       systems = [ ];
diff --git a/lib.nix b/lib.nix
index a470cbc..6c314c6 100644
--- a/lib.nix
+++ b/lib.nix
@@ -1,4 +1,6 @@
 { lib
+, builtinModules
+, extraModules
   # Optionally a string with extra version info to be included in the error message
   # in case is lib is out of date. Empty or starts with space.
 , revInfo ? ""
@@ -139,7 +141,7 @@ let
             inherit self flake-parts-lib moduleLocation;
             inputs = args.inputs or /* legacy, warned above */ self.inputs;
           } // specialArgs;
-          modules = [ ./all-modules.nix (lib.setDefaultModuleLocation errorLocation module) ];
+          modules = builtins.attrValues builtinModules ++ [ (lib.setDefaultModuleLocation errorLocation module) ];
           class = "flake";
         }
         );
@@ -294,7 +296,7 @@ let
       _class = "flake";
       imports = [
         module
-        ./extras/modules.nix
+        extraModules.modules
       ];
       flake.modules.flake.${name} = module;
     };