diff --git a/flake.lock b/flake.lock
index a3ad6e4..9511186 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,44 @@
 {
   "nodes": {
+    "codex-cli-nix": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ]
+      },
+      "locked": {
+        "lastModified": 1787798436,
+        "narHash": "sha256-sgQx7yUo2I1c4McylOW1vRklIxDL3Kwzq35ilr7firc=",
+        "owner": "sadjow",
+        "repo": "codex-cli-nix",
+        "rev": "18eb1cac4e17c8cbc40f3a2a83940d8f38ddace5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sadjow",
+        "repo": "codex-cli-nix",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -7,11 +46,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1785119570,
-        "narHash": "sha256-Rgs2xKnGLFWQscxUaXX07oyZeuMDOHEbqDOsgliLFGM=",
+        "lastModified": 1787377438,
+        "narHash": "sha256-Sxu1NLTD/Ern6hFGLlZmtKCSct3YQXZI/lls8RE1XeM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d4fd24667c8cbef124bb70a20380cab75ec8474d",
+        "rev": "65258d5c65a250189fde2e35f490d15e064c4c62",
         "type": "github"
       },
       "original": {
@@ -23,11 +62,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1785858998,
-        "narHash": "sha256-fKCq5jphd6l/Ms6gc3dptkw/TcKLYub9lQE5g6rbbkc=",
+        "lastModified": 1787753485,
+        "narHash": "sha256-BZWCi9ZRJiARTuKTbbtvFTj7t1TK4G3UEckT3HyNfRg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "04607e1165ac22c5fde6dcc54c9e0b3c0487c555",
+        "rev": "062346a6d85bc4b49dfaa61c986e9c5be21217d1",
         "type": "github"
       },
       "original": {
@@ -39,11 +78,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1785747939,
-        "narHash": "sha256-D740uKsMbgsfK2oaDenJLLPIZfq7W0/g4KN/Fls8eKs=",
+        "lastModified": 1787631388,
+        "narHash": "sha256-vMiXptXarfSdJb1Gkc+FYVOAibuBRj7qxGa8z68q1Uw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "104240a772428cc2e20d8fd86c9ddbb886bbaff2",
+        "rev": "ac6b2166e7a9375683b8e98f860f273222337b16",
         "type": "github"
       },
       "original": {
@@ -55,10 +94,26 @@
     },
     "root": {
       "inputs": {
+        "codex-cli-nix": "codex-cli-nix",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable"
       }
+    },
+    "systems": {
+      "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 8f801c3..e004545 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,6 +10,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    codex-cli-nix = {
+      url = "github:sadjow/codex-cli-nix";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
+
   };
 
   outputs =
@@ -17,6 +22,7 @@
       self,
       nixpkgs,
       home-manager,
+      codex-cli-nix,
       ...
     }:
     let
@@ -50,6 +56,7 @@
               home-manager.backupFileExtension = "backup";
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
+              home-manager.extraSpecialArgs = { inherit codex-cli-nix pkgs-unstable; };
 
               home-manager.users.lukas.imports = [
                 ./home/lukas/laptop/default.nix
@@ -69,6 +76,7 @@
               home-manager.backupFileExtension = "backup";
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
+              home-manager.extraSpecialArgs = { inherit codex-cli-nix pkgs-unstable; };
 
               home-manager.users.lukas.imports = [
                 ./home/lukas/tower/default.nix
diff --git a/home/lukas/common/packages.nix b/home/lukas/common/packages.nix
new file mode 100644
index 0000000..910302e
--- /dev/null
+++ b/home/lukas/common/packages.nix
@@ -0,0 +1,8 @@
+{ codex-cli-nix, pkgs, pkgs-unstable, ... }:
+
+{
+  home.packages = [
+    pkgs-unstable.rtk
+    codex-cli-nix.packages.${pkgs.system}.default
+  ];
+}
diff --git a/home/lukas/laptop/default.nix b/home/lukas/laptop/default.nix
index ae2a89f..f79c3de 100644
--- a/home/lukas/laptop/default.nix
+++ b/home/lukas/laptop/default.nix
@@ -1,6 +1,7 @@
 {
   imports = [
     ./packages.nix
+    ../common/packages.nix
     ../common/brave.nix
     ../common/direnv.nix
     ../common/emacs.nix
@@ -17,4 +18,3 @@
   home.homeDirectory = "/home/lukas";
   home.stateVersion = "26.05";
 }
-
diff --git a/home/lukas/tower/default.nix b/home/lukas/tower/default.nix
index 18701cb..feabcf7 100644
--- a/home/lukas/tower/default.nix
+++ b/home/lukas/tower/default.nix
@@ -1,6 +1,7 @@
 {
   imports = [
     ./packages.nix
+    ../common/packages.nix
     ../common/brave.nix
     ../common/direnv.nix
     ../common/emacs.nix
@@ -17,4 +18,3 @@
   home.homeDirectory = "/home/lukas";
   home.stateVersion = "26.05";
 }
-
diff --git a/hosts/segfault-machine/configuration.nix b/hosts/segfault-machine/configuration.nix
index a076356..3b2b56d 100644
--- a/hosts/segfault-machine/configuration.nix
+++ b/hosts/segfault-machine/configuration.nix
@@ -35,4 +35,3 @@
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
 }
-
diff --git a/hosts/segfault-tower/configuration.nix b/hosts/segfault-tower/configuration.nix
index 1b9fb80..79f0f01 100644
--- a/hosts/segfault-tower/configuration.nix
+++ b/hosts/segfault-tower/configuration.nix
@@ -31,8 +31,6 @@
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
   boot.initrd.luks.devices."luks-b10eb0c6-67b8-40b6-bba4-83d38267abad".device = "/dev/disk/by-uuid/b10eb0c6-67b8-40b6-bba4-83d38267abad";
 
   boot.resumeDevice = "/dev/mapper/luks-b10eb0c6-67b8-40b6-bba4-83d38267abad";
diff --git a/modules/services/codex-lb.nix b/modules/services/codex-lb.nix
index a05d018..e96c969 100644
--- a/modules/services/codex-lb.nix
+++ b/modules/services/codex-lb.nix
@@ -1,5 +1,3 @@
-{ config, pkgs, ... }:
-
 {
   virtualisation.oci-containers.containers.codex-lb = {
     image = "ghcr.io/soju06/codex-lb:beta";
@@ -13,6 +11,10 @@
     volumes = [
       "codex-lb-data:/var/lib/codex-lb"
     ];
+
+    environment = {
+      CODEX_LB_HTTP_RESPONSES_SESSION_BRIDGE_ENABLED = "false";
+    };
   };
 
   networking.firewall.allowedTCPPorts = [