diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 2199771..57f6157 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -1,5 +1,5 @@
 # Configuration common to all Linux systems
-{ flake, ... }:
+{ flake, lib, ... }:
 
 let
   inherit (flake) config inputs;
@@ -8,7 +8,7 @@ in
 {
   imports = [
     {
-      users.users.${config.me.username}.isNormalUser = true;
+      users.users.${config.me.username}.isNormalUser = lib.mkDefault true;
       home-manager.users.${config.me.username} = { };
       home-manager.sharedModules = [
         self.homeModules.default
diff --git a/modules/nixos/shared/primary-as-admin.nix b/modules/nixos/shared/primary-as-admin.nix
index 0dbf4c9..c01f792 100644
--- a/modules/nixos/shared/primary-as-admin.nix
+++ b/modules/nixos/shared/primary-as-admin.nix
@@ -19,7 +19,7 @@
         openssh.authorizedKeys.keys = myKeys;
         shell = pkgs.zsh;
       } // lib.optionalAttrs pkgs.stdenv.isLinux {
-        isNormalUser = true;
+        isNormalUser = lib.mkDefault true;
         extraGroups = [ "networkmanager" "wheel" ];
       };
     };