diff --git a/lib/mk_computer.nix b/lib/mk_computer.nix
index 833a9b5..08c275b 100644
--- a/lib/mk_computer.nix
+++ b/lib/mk_computer.nix
@@ -42,13 +42,10 @@ inputs.nixpkgs.lib.nixosSystem {
   modules = ([
     # System configuration for this host
     (import "${inputs.self}/systems/${hostname}" { inherit hostname; })
-
     # Common configuration
     "${inputs.self}/modules"
-
-    { az-username = username; }
-
     {
+      az-username = username;
       home-manager.users.${username}.imports = [
         "${inputs.self}/home-manager/profiles/${home-module}.nix"
       ];
diff --git a/lib/mk_raspi.nix b/lib/mk_raspi.nix
index 95c3a7f..f21548f 100644
--- a/lib/mk_raspi.nix
+++ b/lib/mk_raspi.nix
@@ -49,13 +49,10 @@ inputs.nixpkgs.lib.nixosSystem {
   modules = ([
     # System configuration for this host
     (import "${inputs.self}/systems/${hostname}" { inherit hostname; })
-
     # Common configuration
     "${inputs.self}/modules"
-
-    { az-username = username; }
-
     {
+      az-username = username;
       home-manager.users.${username}.imports = [
         "${inputs.self}/home-manager/profiles/${home-module}.nix"
       ];