diff --git a/nix/flake.nix b/nix/flake.nix
index 49e00c3..8712584 100755
--- a/nix/flake.nix
+++ b/nix/flake.nix
@@ -43,20 +43,17 @@
               };
             };
             system = "x86_64-linux";
-            modules =
-              [
-                ./hosts/${host.name}/configuration.nix
-                home-manager.nixosModules.home-manager
-                {
-                  nix.settings.experimental-features = [
-                    "nix-command"
-                    "flakes"
-                  ];
-                }
-              ]
-              ++ (
-                if builtins.hasAttr "isWSL" host && host.isWSL then [ nixos-wsl.nixosModules.default ] else [ ]
-              );
+            modules = [
+              ./hosts/${host.name}/configuration.nix
+              ./modules/default.nix
+              home-manager.nixosModules.home-manager
+              {
+                nix.settings.experimental-features = [
+                  "nix-command"
+                  "flakes"
+                ];
+              }
+            ] ++ (if builtins.hasAttr "isWSL" host then [ nixos-wsl.nixosModules.default ] else [ ]);
           };
         }) hosts
       );
diff --git a/nix/hosts/tux/configuration.nix b/nix/hosts/tux/configuration.nix
index ba07cfe..b9e5fc3 100755
--- a/nix/hosts/tux/configuration.nix
+++ b/nix/hosts/tux/configuration.nix
@@ -16,7 +16,6 @@
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    ../../modules/default.nix
   ];
 
   boot.loader.grub = {
diff --git a/nix/hosts/wsl-kumatani/configuration.nix b/nix/hosts/wsl-kumatani/configuration.nix
index efc679a..db06b28 100755
--- a/nix/hosts/wsl-kumatani/configuration.nix
+++ b/nix/hosts/wsl-kumatani/configuration.nix
@@ -11,7 +11,7 @@
 }:
 
 {
-  imports = [ ../../modules/default.nix ];
+  imports = [ ];
 
   wsl.enable = true;
   wsl.defaultUser = "luca";
diff --git a/nix/hosts/wsl-usahara/configuration.nix b/nix/hosts/wsl-usahara/configuration.nix
index efc679a..db06b28 100755
--- a/nix/hosts/wsl-usahara/configuration.nix
+++ b/nix/hosts/wsl-usahara/configuration.nix
@@ -11,7 +11,7 @@
 }:
 
 {
-  imports = [ ../../modules/default.nix ];
+  imports = [ ];
 
   wsl.enable = true;
   wsl.defaultUser = "luca";
diff --git a/nix/modules/commonPackages.nix b/nix/modules/commonPackages.nix
index e87cbcf..6ecd109 100755
--- a/nix/modules/commonPackages.nix
+++ b/nix/modules/commonPackages.nix
@@ -24,6 +24,7 @@
       asciiquarium
     ];
     programs.nix-ld.enable = true;
+    programs.zsh.enable = true;
 
     programs.neovim = {
       enable = true;
diff --git a/nix/modules/hm.nix b/nix/modules/hm.nix
index 57db71f..f8ca2d1 100755
--- a/nix/modules/hm.nix
+++ b/nix/modules/hm.nix
@@ -13,6 +13,5 @@
     home-manager.useGlobalPkgs = true;
     home-manager.useUserPackages = true;
     home-manager.users.luca = import ../users/luca/home.nix;
-    programs.zsh.enable = true;
   };
 }