diff --git a/home/programs/codex.nix b/home/programs/codex.nix
index 06b827a..a7b6edc 100644
--- a/home/programs/codex.nix
+++ b/home/programs/codex.nix
@@ -1,10 +1,10 @@
 {
   device,
-  masterPkgs,
+  pkgs,
   ...
 }: {
   programs.codex = {
     enable = device.is "ryu" || device.is "kuro";
-    package = masterPkgs.codex;
+    package = pkgs.codex;
   };
 }
diff --git a/overlays.nix b/overlays.nix
index 0877bb9..66a8556 100644
--- a/overlays.nix
+++ b/overlays.nix
@@ -12,6 +12,7 @@ in
     (import ./overlays/darwin.nix args)
     (import ./overlays/themes.nix args)
     (import ./overlays/gaming.nix args)
+    (import ./overlays/codex.nix args)
     (import ./overlays/applications.nix args)
     (import ./overlays/flat-manager.nix args)
     # (import ./overlays/ai.nix args)
diff --git a/overlays/codex.nix b/overlays/codex.nix
new file mode 100644
index 0000000..cc00a7e
--- /dev/null
+++ b/overlays/codex.nix
@@ -0,0 +1,24 @@
+{...}: final: prev: {
+  codex = prev.codex.overrideAttrs (finalAttrs: _oldAttrs: {
+    version = "0.139.0";
+
+    src = prev.fetchFromGitHub {
+      owner = "openai";
+      repo = "codex";
+      tag = "rust-v${finalAttrs.version}";
+      hash = "sha256-XjzlkBUkBey+P3tFLDYB3ae5oseUfW5tmzhLzqlqj2E=";
+    };
+    sourceRoot = "${finalAttrs.src.name}/codex-rs";
+    cargoDeps = final.rustPlatform.fetchCargoVendor {
+      inherit (finalAttrs) pname version src sourceRoot;
+      hash = "sha256-8mN4OTRJvt2mBYHQXZS55PSOChLqEIiXwPu2y+2MZ9o=";
+    };
+    postPatch = ''
+      substituteInPlace $cargoDepsCopy/*/webrtc-sys-*/build.rs \
+        --replace-fail "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=dylib=webrtc"
+      substituteInPlace Cargo.toml \
+        --replace-fail 'lto = "thin"' "" \
+        --replace-fail 'codegen-units = 1' ""
+    '';
+  });
+}