diff --git a/flake.lock b/flake.lock
index 837b384..3cc6a81 100644
--- a/flake.lock
+++ b/flake.lock
@@ -526,7 +526,9 @@
         "blueprint": "blueprint",
         "bun2nix": "bun2nix",
         "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ],
         "systems": "systems_2",
         "treefmt-nix": "treefmt-nix"
       },
@@ -548,7 +550,7 @@
       "inputs": {
         "niri-stable": "niri-stable",
         "niri-unstable": "niri-unstable",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_3",
         "nixpkgs-stable": "nixpkgs-stable",
         "xwayland-satellite-stable": "xwayland-satellite-stable",
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
@@ -619,7 +621,7 @@
     "nixos-wsl": {
       "inputs": {
         "flake-compat": "flake-compat_4",
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
         "lastModified": 1777732699,
@@ -712,22 +714,6 @@
       }
     },
     "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1779955849,
-        "narHash": "sha256-31mhzm2HpzRr/rupWAFfWBmt9SUjzwr5+giv5Nmb/rA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a2c6938835fca96e4a10c8561d461efd2f91d04f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable-small",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
       "locked": {
         "lastModified": 1779560665,
         "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
@@ -743,7 +729,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1776169885,
         "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=",
@@ -759,7 +745,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_6": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1779622335,
         "narHash": "sha256-ViA62qtL5za7V3d5I8OA9q9JcFhsVAiL5jVHwEclWqk=",
@@ -775,7 +761,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_7": {
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1770107345,
         "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=",
@@ -791,7 +777,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_8": {
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1772542754,
         "narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=",
@@ -953,7 +939,7 @@
         "niri-flake": "niri-flake",
         "nixos-hardware": "nixos-hardware",
         "nixos-wsl": "nixos-wsl",
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_5",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nixvim": "nixvim",
         "noctalia": "noctalia",
@@ -1286,7 +1272,7 @@
     },
     "treefmt-nix_3": {
       "inputs": {
-        "nixpkgs": "nixpkgs_7"
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
         "lastModified": 1775636079,
@@ -1304,7 +1290,7 @@
     },
     "vicinae": {
       "inputs": {
-        "nixpkgs": "nixpkgs_8",
+        "nixpkgs": "nixpkgs_7",
         "systems": "systems_7"
       },
       "locked": {
diff --git a/flake.nix b/flake.nix
index 95922bb..be96337 100644
--- a/flake.nix
+++ b/flake.nix
@@ -80,7 +80,10 @@
     services-flake.url = "github:juspay/services-flake";
 
     # LLM agents
-    llm-agents.url = "github:numtide/llm-agents.nix";
+    llm-agents = {
+      url = "github:numtide/llm-agents.nix";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
 
     # Systems
     systems.url = "github:nix-systems/default-linux";
diff --git a/hosts/default.nix b/hosts/default.nix
index 0cbb0c1..1ab006b 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -31,6 +31,7 @@ let
       modules = [
         {
           nixpkgs.config.allowUnfree = true;
+          nixpkgs.overlays = [ inputs.llm-agents.overlays.default ];
         }
         ../modules
         ./${host}/default.nix
diff --git a/modules/applications/claude/system.nix b/modules/applications/claude/system.nix
index 7eaee9d..ac776a9 100644
--- a/modules/applications/claude/system.nix
+++ b/modules/applications/claude/system.nix
@@ -1,6 +1,5 @@
 {
   pkgs,
-  inputs,
   lib,
   config,
   ...
@@ -15,7 +14,7 @@ in
 
   config = lib.mkIf cfg.enable {
     environment.systemPackages = [
-      inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.claude-code # AI coding assistant
+      pkgs.llm-agents.claude-code # AI coding assistant
     ];
   };
 }
diff --git a/modules/applications/codex.nix b/modules/applications/codex.nix
index f3faa31..264061f 100644
--- a/modules/applications/codex.nix
+++ b/modules/applications/codex.nix
@@ -1,6 +1,5 @@
 {
   pkgs,
-  inputs,
   lib,
   config,
   ...
@@ -15,7 +14,7 @@ in
 
   config = lib.mkIf cfg.enable {
     environment.systemPackages = [
-      inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.codex # OpenAI Codex CLI
+      pkgs.llm-agents.codex # OpenAI Codex CLI
     ];
   };
 }
diff --git a/modules/applications/default.nix b/modules/applications/default.nix
index bb87d41..38f4869 100644
--- a/modules/applications/default.nix
+++ b/modules/applications/default.nix
@@ -12,6 +12,7 @@
     ./ghostty
     ./git
     ./gnupg.nix
+    ./grok.nix
     ./greetd.nix
     ./gtk
     ./java
diff --git a/modules/applications/grok.nix b/modules/applications/grok.nix
new file mode 100644
index 0000000..975f39b
--- /dev/null
+++ b/modules/applications/grok.nix
@@ -0,0 +1,20 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+let
+  cfg = config.my.applications.grok;
+in
+{
+  options.my.applications.grok = {
+    enable = lib.mkEnableOption "Grok AI assistant";
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = [
+      pkgs.llm-agents.grok # Grok AI CLI
+    ];
+  };
+}
diff --git a/modules/applications/opencode.nix b/modules/applications/opencode.nix
index 0476c31..04ed3bd 100644
--- a/modules/applications/opencode.nix
+++ b/modules/applications/opencode.nix
@@ -1,6 +1,5 @@
 {
   pkgs,
-  inputs,
   lib,
   config,
   ...
@@ -15,7 +14,7 @@ in
 
   config = lib.mkIf cfg.enable {
     environment.systemPackages = [
-      inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.opencode # OpenCode CLI
+      pkgs.llm-agents.opencode # OpenCode CLI
     ];
   };
 }
diff --git a/modules/features/dev/agent.nix b/modules/features/dev/agent.nix
index 1ad04f2..e5d941e 100644
--- a/modules/features/dev/agent.nix
+++ b/modules/features/dev/agent.nix
@@ -14,8 +14,9 @@ in
   config = lib.mkIf cfg.enable {
     my.applications = {
       claude.enable = true;
-      # codex.enable = true;
+      codex.enable = true;
       opencode.enable = true;
+      grok.enable = true;
     };
   };
 }