diff --git a/flake.nix b/flake.nix
index 82be66db..97952ccf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,14 +29,18 @@
       };
 
       nixosModules = let
-        moduleList = import ./modules;
-
-        modulesAttrs = listToAttrs (map (path: {
+        prep = map (path: {
           name = removeSuffix ".nix" (baseNameOf path);
           value = import path;
-        }) moduleList);
+        });
 
-        profilesAttrs = { profiles = import ./profiles; };
+        moduleList = import ./modules;
+
+        modulesAttrs = listToAttrs (prep moduleList);
+
+        profilesList = import ./profiles;
+
+        profilesAttrs = { profiles = listToAttrs (prep profilesList); };
       in modulesAttrs // profilesAttrs;
     };
 }
diff --git a/profiles/default.nix b/profiles/default.nix
index f8c3a670..11556a75 100644
--- a/profiles/default.nix
+++ b/profiles/default.nix
@@ -1,11 +1,11 @@
-{
-  graphical = import ./graphical;
-  sway = import ./graphical/sway;
-  qutebrowser = import ./graphical/qutebrowser;
-  develop = import ./develop;
-  zsh = import ./develop/zsh;
-  tmux = import ./develop/tmux;
-  kakoune = import ./develop/kakoune;
-  misc = import ./misc;
-  games = import ./game;
-}
+[
+  ./graphical
+  ./graphical/sway
+  ./graphical/qutebrowser
+  ./develop
+  ./develop/zsh
+  ./develop/tmux
+  ./develop/kakoune
+  ./misc
+  ./games
+]