diff --git a/home/hosts/astyanax/default.nix b/home/hosts/astyanax/default.nix
index 10c05db..68f836d 100644
--- a/home/hosts/astyanax/default.nix
+++ b/home/hosts/astyanax/default.nix
@@ -5,6 +5,9 @@
   ...
 }:
 
+let
+  username = "h";
+in
 {
   imports = [
     ../../modules/dconf.nix # TODO: Only enable when on Gnome?
@@ -16,8 +19,8 @@
   ];
 
   home.stateVersion = "25.05";
-  home.username = "h";
-  home.homeDirectory = "/home/h";
+  home.username = username;
+  home.homeDirectory = "/home/${username}";
 
   xdg.userDirs.createDirectories = false;
   xdg.userDirs.download = "${config.home.homeDirectory}/dl";
diff --git a/home/hosts/work/default.nix b/home/hosts/work/default.nix
index 8e6b5ac..a5715c1 100644
--- a/home/hosts/work/default.nix
+++ b/home/hosts/work/default.nix
@@ -5,6 +5,9 @@
   ...
 }:
 
+let
+  username = "hektor";
+in
 {
   imports = [
     inputs.sops-nix.homeManagerModules.sops
@@ -12,13 +15,13 @@
   ];
 
   home.stateVersion = "25.05";
-  home.username = "hektor";
-  home.homeDirectory = "/home/hektor";
+  home.username = username;
+  home.homeDirectory = "/home/${username}";
 
   sops = {
     defaultSopsFile = "${builtins.toString inputs.nix-secrets}/secrets.yaml";
     defaultSopsFormat = "yaml";
-    age.keyFile = "/home/${config.home.username}/.config/sops/age/keys.txt";
+    age.keyFile = "${config.home.homeDirectory}/.config/sops/age/keys.txt";
 
     secrets."test" = { };
   };