diff --git a/default.nix b/default.nix
index 00ee0fa..71a5d0c 100644
--- a/default.nix
+++ b/default.nix
@@ -18,9 +18,6 @@ in
 
   config = mkMerge [
 
-    (import ./modules/cli.nix { inherit config pkgs lib; })
-    (import ./modules/baseline.nix { inherit config pkgs lib; })
-
     (mkIf (cfg.profile == "server") (mkMerge [
       { services.openssh.enable = true; }
       (import ./modules/auto-update.nix { })
@@ -41,5 +38,7 @@ in
 
   imports = [
     ./modules/alacritty.nix
+    ./modules/baseline.nix
+    ./modules/cli.nix
   ];
 }