diff --git a/nixos/code.nix b/nixos/code.nix
index 901a49ae..e3fa0297 100644
--- a/nixos/code.nix
+++ b/nixos/code.nix
@@ -64,6 +64,10 @@ makeEnable config "myModules.code" true {
 
     programs.codexDesktopLinux = {
       enable = true;
+      # Bake CODEX_CLI_PATH into the launcher so Codex Desktop always finds this
+      # CLI, regardless of how it is started (GUI autostart, app launcher,
+      # terminal, or warm-start handoff) and without needing a re-login.
+      cliPackage = pkgs.codex;
       computerUseUi.enable = true;
       remoteMobileControl.enable = true;
       remoteControl = {
diff --git a/nixos/flake.lock b/nixos/flake.lock
index 76cda36b..5fa43cc5 100644
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -183,11 +183,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781005942,
-        "narHash": "sha256-rAc/DbJww2q8kSXf8nQDtBRws0/dUUNtYEKG+UVmOKA=",
+        "lastModified": 1781231404,
+        "narHash": "sha256-RgbXa8W975nSV2zyQdcXjuQepahhlAF0cW6jwecU9x4=",
         "owner": "colonelpanic8",
         "repo": "codex-desktop-linux",
-        "rev": "6cd66b29bbc38884ef9a9a59d1add0c789009d74",
+        "rev": "8b8c5f05774ec9a48664dcf657f9fb7761174f8c",
         "type": "github"
       },
       "original": {