diff --git a/home-manager/hosts/EDI/lillian.nix b/home-manager/hosts/EDI/lillian.nix
index 1686c30..ed564ed 100644
--- a/home-manager/hosts/EDI/lillian.nix
+++ b/home-manager/hosts/EDI/lillian.nix
@@ -21,5 +21,5 @@
   ];
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  home.stateVersion = "25.11";
+  home.stateVersion = "26.05";
 }
diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix
index 7097090..a978fd4 100644
--- a/home-manager/hosts/GLaDOS/lillian.nix
+++ b/home-manager/hosts/GLaDOS/lillian.nix
@@ -30,5 +30,5 @@
   };
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  home.stateVersion = "25.11";
+  home.stateVersion = "26.05";
 }
diff --git a/home-manager/hosts/queen/lillian.nix b/home-manager/hosts/queen/lillian.nix
index 9bd29f7..9297b6a 100644
--- a/home-manager/hosts/queen/lillian.nix
+++ b/home-manager/hosts/queen/lillian.nix
@@ -35,5 +35,5 @@
   };
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  home.stateVersion = "25.05";
+  home.stateVersion = "26.05";
 }
diff --git a/home-manager/hosts/shodan/lillian.nix b/home-manager/hosts/shodan/lillian.nix
index 7e7e9bf..e072776 100644
--- a/home-manager/hosts/shodan/lillian.nix
+++ b/home-manager/hosts/shodan/lillian.nix
@@ -40,5 +40,5 @@
   programs.plasma.kscreenlocker.passwordRequired = false;
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  home.stateVersion = "25.11";
+  home.stateVersion = "26.05";
 }
diff --git a/home-manager/hosts/wheatley/lillian.nix b/home-manager/hosts/wheatley/lillian.nix
index d190612..9297b6a 100644
--- a/home-manager/hosts/wheatley/lillian.nix
+++ b/home-manager/hosts/wheatley/lillian.nix
@@ -35,5 +35,5 @@
   };
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  home.stateVersion = "25.11";
+  home.stateVersion = "26.05";
 }
diff --git a/home-manager/shared/shell/zellij/default.nix b/home-manager/shared/shell/zellij/default.nix
index 4804e5a..b84dcb9 100644
--- a/home-manager/shared/shell/zellij/default.nix
+++ b/home-manager/shared/shell/zellij/default.nix
@@ -55,7 +55,7 @@
 
         default_tab_template {
           pane size=1 borderless=true {
-            plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" {
+            plugin location="file:${inputs.zjstatus.packages.${pkgs.stdenv.hostPlatform.system}.default}/bin/zjstatus.wasm" {
               format_left  "#[bg=#24273A,fg=#cad3f5,bold] {session} {mode} {tabs}"
               format_right "#[bg=#cad3f5,fg=#24273A]#[bg=#cad3f5,fg=#cad3f5]#[bg=#cad3f5,fg=#1e2030,bold]{datetime}#[bg=#24273A,fg=#cad3f5]"
 
@@ -138,7 +138,7 @@
 
         default_tab_template {
           pane size=1 borderless=true {
-            plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" {
+            plugin location="file:${inputs.zjstatus.packages.${pkgs.stdenv.hostPlatform.system}.default}/bin/zjstatus.wasm" {
               format_left  "#[bg=#24273A,fg=#cad3f5,bold] {session} {mode} {tabs}"
               format_right "#[bg=#cad3f5,fg=#24273A]#[bg=#cad3f5,fg=#cad3f5]#[bg=#cad3f5,fg=#1e2030,bold]{datetime}#[bg=#24273A,fg=#cad3f5]"
 
diff --git a/nixos/hosts/EDI/configuration.nix b/nixos/hosts/EDI/configuration.nix
index fc742ef..1154d2f 100644
--- a/nixos/hosts/EDI/configuration.nix
+++ b/nixos/hosts/EDI/configuration.nix
@@ -98,5 +98,5 @@
   };
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  system.stateVersion = "25.11";
+  system.stateVersion = "26.05";
 }
diff --git a/nixos/hosts/GLaDOS/configuration.nix b/nixos/hosts/GLaDOS/configuration.nix
index 81777e5..a42df29 100644
--- a/nixos/hosts/GLaDOS/configuration.nix
+++ b/nixos/hosts/GLaDOS/configuration.nix
@@ -94,5 +94,5 @@
   users.users.lillian.extraGroups = ["gamemode"];
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  system.stateVersion = "25.11";
+  system.stateVersion = "26.05";
 }
diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix
index 7f7d628..7823b4e 100644
--- a/nixos/hosts/queen/configuration.nix
+++ b/nixos/hosts/queen/configuration.nix
@@ -233,5 +233,5 @@
   };
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  system.stateVersion = "25.11";
+  system.stateVersion = "26.05";
 }
diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix
index 09a242f..262332b 100644
--- a/nixos/hosts/shodan/configuration.nix
+++ b/nixos/hosts/shodan/configuration.nix
@@ -168,5 +168,5 @@
   # environment.variables.GIO_EXTRA_MODULES = lib.mkForce ["${pkgs.gvfs}/lib/gio/modules"];
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  system.stateVersion = "25.11";
+  system.stateVersion = "26.05";
 }
diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix
index d36c12c..ff89965 100644
--- a/nixos/hosts/wheatley/configuration.nix
+++ b/nixos/hosts/wheatley/configuration.nix
@@ -412,6 +412,6 @@
   services.cage.enable = true;
   nixpkgs.config.kodi.enableAdvancedLauncher = true;
 
-  system.stateVersion = "25.11";
+  system.stateVersion = "26.05";
   nixpkgs.hostPlatform = lib.mkForce "aarch64-linux";
 }
diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix
index 1ca3989..63929e7 100644
--- a/nixos/shared/default.nix
+++ b/nixos/shared/default.nix
@@ -5,6 +5,7 @@
   config,
   pkgs,
   pkgs-edge,
+  stdenv,
   ...
 }: {
   imports = [
@@ -163,7 +164,7 @@
   };
 
   services.scx.enable =
-    if (pkgs.system == "aarch64-linux")
+    if (pkgs.stdenv.hostPlatform.system == "aarch64-linux")
     then false
     else true;