diff --git a/nixos/common.nix b/nixos/common.nix
index d28e3db7..e310d002 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -1,4 +1,8 @@
-{ config, pkgs, lib, inputs, nixpkgs-nixos-unstable-and-unfree, ... }: {
+{ config, pkgs, lib, inputs, nixpkgs-nixos-unstable-and-unfree, ... }:
+let
+  stateVersion = "22.05";
+  username = "cyryl";
+in {
   imports = [
     ./common-hardware.nix
     ./common-services.nix
@@ -29,7 +33,7 @@
 
   i18n.defaultLocale = "en_GB.UTF-8";
 
-  users.users.cyryl = {
+  users.users."${username}" = {
     isNormalUser = true;
     extraGroups = [
       "adbusers"
@@ -94,5 +98,5 @@
     '';
   };
 
-  system = { stateVersion = "22.05"; };
+  system = { inherit stateVersion; };
 }