diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix
index 1f89768..fd99b82 100644
--- a/hosts/tartarus/configuration.nix
+++ b/hosts/tartarus/configuration.nix
@@ -6,7 +6,9 @@
   pkgs,
   system-label,
   ...
-}: {
+}: let
+  stateVersion = "24.05";
+in {
   imports = [
     ./hardware-configuration.nix
     ../../modules
@@ -18,13 +20,13 @@
   boot.binfmt.emulatedSystems = ["aarch64-linux"];
   nix.settings.extra-platforms = config.boot.binfmt.emulatedSystems;
 
-
   services.vscode-server.enable = true;
 
   home-manager.useGlobalPkgs = true;
   home-manager.useUserPackages = true;
-  home-manager.users.osbm = import ../../modules/home.nix { stateVersion = "24.05"; };
-
+  home-manager.users.osbm = import ../../modules/home.nix {
+    inherit config pkgs stateVersion;
+  };
   virtualisation.virtualbox.host.enable = true;
   users.extraGroups.vboxusers.members = ["osbm"];
 
@@ -117,5 +119,5 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "24.05"; # Did you read the comment?
+  system.stateVersion = stateVersion; # Did you read the comment?
 }
diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix
index 642dcb0..6b24796 100644
--- a/hosts/ymir/configuration.nix
+++ b/hosts/ymir/configuration.nix
@@ -6,7 +6,9 @@
   pkgs,
   system-label,
   ...
-}: {
+}: let
+  stateVersion = "24.11";
+in {
   imports = [
     ./hardware-configuration.nix
     ../../modules
@@ -20,10 +22,11 @@
   networking.hostName = "ymir"; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
-
   home-manager.useGlobalPkgs = true;
   home-manager.useUserPackages = true;
-  home-manager.users.osbm = import ../../modules/home.nix { stateVersion = "24.11"; };
+  home-manager.users.osbm = import ../../modules/home.nix {
+    inherit config pkgs stateVersion;
+  };
 
   # Configure network proxy if necessary
   # networking.proxy.default = "http://user:password@proxy:port/";
@@ -204,5 +207,5 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "24.11"; # Did you read the comment?
+  system.stateVersion = stateVersion; # Did you read the comment?
 }