diff --git a/configurations/nixos/horizon/configuration.nix b/configurations/nixos/horizon/configuration.nix
index 0e86fe7..0245253 100644
--- a/configurations/nixos/horizon/configuration.nix
+++ b/configurations/nixos/horizon/configuration.nix
@@ -88,6 +88,7 @@
   environment.systemPackages = with pkgs; [
     cachefilesd
     webtoon-dl
+    noita_entangled_worlds
   ];
   services.cachefilesd.enable = true;
 
diff --git a/flake.lock b/flake.lock
index e9d259b..a3c552f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -329,6 +329,43 @@
         "type": "github"
       }
     },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1759070547,
+        "narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "647e5c14cbd5067f44ac86b74f014962df460840",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "noita-entangled-worlds": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_3",
+        "rust-overlay": "rust-overlay",
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1764204484,
+        "narHash": "sha256-S45ghD/YjcKDy8Mz3DYklLMaA/z6f6mTbx0i7pAktYk=",
+        "owner": "IntQuant",
+        "repo": "noita_entangled_worlds",
+        "rev": "ab2c2162157140ab519fa19f6737c044e1ed0e3b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "IntQuant",
+        "ref": "master",
+        "repo": "noita_entangled_worlds",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "disko": "disko",
@@ -343,10 +380,32 @@
         "nix-vscode-extensions": "nix-vscode-extensions",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2",
+        "noita-entangled-worlds": "noita-entangled-worlds",
         "secrets": "secrets",
         "sops-nix": "sops-nix"
       }
     },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "noita-entangled-worlds",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1759199574,
+        "narHash": "sha256-w24RYly3VSVKp98rVfCI1nFYfQ0VoWmShtKPCbXgK6A=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "381776b12d0d125edd7c1930c2041a1471e586c0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "secrets": {
       "flake": false,
       "locked": {
@@ -412,6 +471,22 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_3": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 6f85fa3..e935688 100644
--- a/flake.nix
+++ b/flake.nix
@@ -77,6 +77,12 @@
       url = "github:utensils/mcp-nixos";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    # Noita Entangled Worlds package
+    # Not following our nixpkgs so it can use its own rust-overlay configuration
+    noita-entangled-worlds = {
+      url = "github:IntQuant/noita_entangled_worlds/master";
+    };
   };
 
   outputs = {
diff --git a/modules/common-modules/overlays/default.nix b/modules/common-modules/overlays/default.nix
index 2c0f712..f658e8a 100644
--- a/modules/common-modules/overlays/default.nix
+++ b/modules/common-modules/overlays/default.nix
@@ -2,5 +2,9 @@
 {inputs, ...}: {
   nixpkgs.overlays = [
     inputs.nix-vscode-extensions.overlays.default
+    # Add noita_entangled_worlds from upstream flake to pkgs
+    (final: prev: {
+      noita_entangled_worlds = inputs.noita-entangled-worlds.packages.${prev.system}.noita-proxy;
+    })
   ];
 }
diff --git a/modules/common-modules/pkgs/default.nix b/modules/common-modules/pkgs/default.nix
index 612dd08..2afc9f2 100644
--- a/modules/common-modules/pkgs/default.nix
+++ b/modules/common-modules/pkgs/default.nix
@@ -20,9 +20,6 @@
         ./prostudiomasters.nix
         {};
     })
-    (final: prev: {
-      noita_entangled_worlds = pkgs.callPackage ./noita-entangled-worlds.nix {};
-    })
     (final: prev: {
       gdx-liftoff = pkgs.callPackage ./gdx-liftoff.nix {};
     })
diff --git a/modules/common-modules/pkgs/noita-entangled-worlds.nix b/modules/common-modules/pkgs/noita-entangled-worlds.nix
deleted file mode 100644
index 322ce41..0000000
--- a/modules/common-modules/pkgs/noita-entangled-worlds.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-# not working yet
-{
-  pkgs,
-  rustPlatform,
-  fetchFromGitHub,
-  ...
-}: let
-  version = "1.5.3";
-  repo = fetchFromGitHub {
-    owner = "IntQuant";
-    repo = "noita_entangled_worlds";
-    rev = "v${version}";
-    hash = "sha256-frrpD0aWTeDbZYtp15R+quUUAZf7OvHlbSLtGJJtAqk=";
-  };
-in
-  rustPlatform.buildRustPackage {
-    name = "noita-proxy-${version}";
-    src = repo + "/noita-proxy";
-    prePatch = ''
-      substituteInPlace Cargo.toml \
-          --replace "path = \"../shared\"" "path = \"${repo + "/shared"}\""
-    '';
-    nativeBuildInputs = with pkgs; [
-      pkg-config
-      python3
-      cmake
-    ];
-    buildInputs = with pkgs; [
-      openssl
-      openssl.dev
-      libpulseaudio
-      libjack2
-      alsa-lib
-      xorg.libxcb
-      xorg.libxcb.dev
-      libopus
-    ];
-    propagatedBuildInputs = with pkgs; [
-      steamworks-sdk-redist
-    ];
-    runtimeDependencies = with pkgs; [
-      steamworks-sdk-redist
-    ];
-    doCheck = false;
-    cargoHash = "sha256-TzUS6d6PopgGf2i1yVaXaXdzNrvfSz+Gv67BAtxYmb4=";
-  }