diff --git a/roles/host_common.nix b/roles/host_common.nix
index 0e28f91..5c8e047 100644
--- a/roles/host_common.nix
+++ b/roles/host_common.nix
@@ -53,7 +53,7 @@
     };
   };
 
-  # Program defauls for Linode VMs
+  # Program defaults for all hosts
   programs.zsh = {
     enable = true;
     autosuggestions = {
@@ -73,8 +73,7 @@
     };
   };
 
-  # Set the default shell for all users
-  users.defaultUserShell = "/run/current-system/sw/bin/zsh";
+  users.defaultUserShell = pkgs.zsh;   # Set the default shell for all users
 
   # Users common across MIO Ops:
   users.mutableUsers = false;        # Remove any users not defined in here