diff --git a/hosts/tomate/configuration.nix b/hosts/tomate/configuration.nix
index 72d7514..7ac0b3a 100644
--- a/hosts/tomate/configuration.nix
+++ b/hosts/tomate/configuration.nix
@@ -27,8 +27,6 @@
       ];
     };
   };
-  users.users.root.shell = pkgs.zsh;
-
 
   # Set your time zone.
   time.timeZone = "Europe/Berlin";
diff --git a/modules/core/zsh.nix b/modules/core/zsh.nix
index 2412e4a..349f3dd 100644
--- a/modules/core/zsh.nix
+++ b/modules/core/zsh.nix
@@ -1,5 +1,6 @@
 { lib, pkgs, ... }:
 {
+  users.users.root.shell = pkgs.zsh;
   programs.command-not-found.enable = false;
   programs.nix-index-database.comma.enable = true;
   environment.systemPackages = with pkgs; [