diff --git a/hosts/tahani/default.nix b/hosts/tahani/default.nix
index 37e54eb..15edb45 100644
--- a/hosts/tahani/default.nix
+++ b/hosts/tahani/default.nix
@@ -48,8 +48,8 @@
 		];
 
 		home.packages = [
-			inputs.beads.packages.${pkgs.system}.default
-			inputs.nix-ai-tools.packages.${pkgs.system}.amp
+			inputs.beads.packages.${pkgs.stdenv.hostPlatform.system}.default
+			inputs.nix-ai-tools.packages.${pkgs.stdenv.hostPlatform.system}.amp
 		];
 
 		programs.git.settings.user.email = "christoph@schmatzler.com";
diff --git a/overlays/zjstatus.nix b/overlays/zjstatus.nix
index 7d14460..5641864 100644
--- a/overlays/zjstatus.nix
+++ b/overlays/zjstatus.nix
@@ -1,3 +1,3 @@
 {inputs}: final: prev: {
-	zjstatus = inputs.zjstatus.packages.${prev.system}.default;
+	zjstatus = inputs.zjstatus.packages.${prev.stdenv.hostPlatform.system}.default;
 }
diff --git a/profiles/opencode.nix b/profiles/opencode.nix
index 12a0bf5..f203fde 100644
--- a/profiles/opencode.nix
+++ b/profiles/opencode.nix
@@ -5,7 +5,7 @@
 }: {
 	programs.opencode = {
 		enable = true;
-		package = inputs.nix-ai-tools.packages.${pkgs.system}.opencode;
+		package = inputs.nix-ai-tools.packages.${pkgs.stdenv.hostPlatform.system}.opencode;
 		settings = {
 			theme = "catppuccin";
 			instructions = [