diff --git a/default.nix b/default.nix
index 061e30e..7f2f2b7 100644
--- a/default.nix
+++ b/default.nix
@@ -1,6 +1,7 @@
 top@{ inputs, ... }: {
   imports = [ ./nixos ./home ];
   systems = [ "x86_64-linux" ];
+  flake.stateVersion = "24.05";
   perSystem = perSystem@{ system, ... }: {
     config._module.args = {
       pkgs = import inputs.nixpkgs {
diff --git a/home/configs/ivand/default.nix b/home/configs/ivand/default.nix
index 0929d98..b1fdb66 100644
--- a/home/configs/ivand/default.nix
+++ b/home/configs/ivand/default.nix
@@ -1,15 +1,15 @@
-toplevel@{ inputs, withSystem, ... }:
+toplevel@{ inputs, withSystem, config, ... }:
 {
   flake.homeConfigurations.ivand = withSystem "x86_64-linux" (ctx@{ pkgs, ... }:
     inputs.home-manager.lib.homeManagerConfiguration {
       inherit pkgs;
       modules =
         let
-          mods = toplevel.config.flake.homeManagerModules;
+          mods = config.flake.homeManagerModules;
         in
         [
           {
-            home.stateVersion = "24.05";
+            home.stateVersion = config.flake.stateVersion;
           }
           inputs.nid.hmModules.nix-index
           inputs.catppuccin.homeManagerModules.catppuccin
diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix
index 1075d07..589fc96 100644
--- a/nixos/modules/default.nix
+++ b/nixos/modules/default.nix
@@ -1,4 +1,4 @@
-{ moduleWithSystem, ... }: {
+top@{ moduleWithSystem, ... }: {
   flake.nixosModules = {
     grub = {
       boot = {
@@ -16,7 +16,7 @@
       };
     };
     base = moduleWithSystem (toplevel@{ ... }: perSystem@{ pkgs, ... }: {
-      system.stateVersion = "24.05";
+      system.stateVersion = top.config.flake.stateVersion;
       nix = {
         extraOptions = ''
           experimental-features = nix-command flakes