diff --git a/common/globals.nix b/common/globals.nix
index e368a69..b4cbafa 100644
--- a/common/globals.nix
+++ b/common/globals.nix
@@ -12,4 +12,6 @@
   timezone = "America/Vancouver";
 
   username = "willem";
+
+  sshAuthorizedKeyFiles = [./sshpubkeys/willem-nixbox ./sshpubkeys/willem-thinkpad ./sshpubkeys/willem-zeus];
 }
diff --git a/common/sshpubkeys/willem-nixbox b/common/sshpubkeys/willem-nixbox
new file mode 100644
index 0000000..e42189a
--- /dev/null
+++ b/common/sshpubkeys/willem-nixbox
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGFprwUFAmOqWlUtRkpGMAQJs6zJVesYIstXVLL3yjse willem@nixbox
diff --git a/common/sshpubkeys/willem-thinkpad b/common/sshpubkeys/willem-thinkpad
new file mode 100644
index 0000000..66cd38a
--- /dev/null
+++ b/common/sshpubkeys/willem-thinkpad
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGe3g5Fuw+jcj+KMeV3cLJPkoBxUogqTtC3Hg7hMj8py willem@thinkpad
diff --git a/common/sshpubkeys/willem-zeus b/common/sshpubkeys/willem-zeus
new file mode 100644
index 0000000..328b670
--- /dev/null
+++ b/common/sshpubkeys/willem-zeus
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBx1z962nl87rmOk/vw3EBSgqU/VlCqON8zTeLHQcSBp willem@zeus
diff --git a/nixos/hosts/zeus.nix b/nixos/hosts/zeus.nix
index a8e0768..23c3720 100644
--- a/nixos/hosts/zeus.nix
+++ b/nixos/hosts/zeus.nix
@@ -3,6 +3,7 @@
     ../../common/system.nix
     ../modules/nix/link-inputs.nix
     ../modules/nix/use-flake-pkgs.nix
+    ../users/willem/base.nix
   ];
 
   nix = {
diff --git a/nixos/users/willem/base.nix b/nixos/users/willem/base.nix
new file mode 100644
index 0000000..1af7516
--- /dev/null
+++ b/nixos/users/willem/base.nix
@@ -0,0 +1,5 @@
+{globals, ...}: {
+  users.users.willem = {
+    openssh.authorizedKeys.keyFiles = globals.sshAuthorizedKeyFiles;
+  };
+}
diff --git a/nixos/users/willem/default.nix b/nixos/users/willem/default.nix
index d8ffa4e..580ddf7 100644
--- a/nixos/users/willem/default.nix
+++ b/nixos/users/willem/default.nix
@@ -1,16 +1,7 @@
-{
-  lib,
-  pkgs,
-  ...
-}: {
+{...}: {
+  imports = [./base.nix];
   users.users.willem = {
-    shell = lib.mkDefault pkgs.zsh;
-    isNormalUser = true;
     extraGroups = ["networkmanager" "wheel" "video" "udev"];
-    openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBx1z962nl87rmOk/vw3EBSgqU/VlCqON8zTeLHQcSBp willem@zeus"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGFprwUFAmOqWlUtRkpGMAQJs6zJVesYIstXVLL3yjse willem@nixbox"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGe3g5Fuw+jcj+KMeV3cLJPkoBxUogqTtC3Hg7hMj8py willem@thinkpad"
-    ];
+    isNormalUser = true;
   };
 }