diff --git a/.gitmodules b/.gitmodules
index 0113575..2b44a4e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "vendor/jumphost-nix"]
 	path = vendor/jumphost-nix
 	url = https://github.com/srid/jumphost-nix.git
-[submodule "vendor/AI"]
-	path = vendor/AI
-	url = https://github.com/srid/AI.git
diff --git a/flake.lock b/flake.lock
index c9c9bb1..2a61455 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,16 +1,19 @@
 {
   "nodes": {
     "AI": {
-      "flake": false,
       "locked": {
-        "path": "vendor/AI",
-        "type": "path"
+        "lastModified": 1773449106,
+        "narHash": "sha256-F7VJ5JJ+GL8GVVZvaH9bGnviG/qLww7iDCQAUwFzHqE=",
+        "owner": "srid",
+        "repo": "AI",
+        "rev": "b771ccada0ec4b19b6e38c101bac95026e6d2434",
+        "type": "github"
       },
       "original": {
-        "path": "vendor/AI",
-        "type": "path"
-      },
-      "parent": []
+        "owner": "srid",
+        "repo": "AI",
+        "type": "github"
+      }
     },
     "aeson-typescript": {
       "flake": false,
diff --git a/flake.nix b/flake.nix
index 4a39f0d..3423799 100644
--- a/flake.nix
+++ b/flake.nix
@@ -34,8 +34,7 @@
     oc.url = "github:juspay/oc";
     # landrun-nix.url = "github:srid/landrun-nix";
     landrun-nix.url = "github:adrian-gierakowski/landrun-nix/darwin-implementation-via-sandbox-exec";
-    AI.url = "path:vendor/AI";
-    AI.flake = false;
+    AI.url = "github:srid/AI";
     jumphost-nix.url = "path:vendor/jumphost-nix";
     jumphost-nix.flake = false;
 
diff --git a/modules/home/opencode/default.nix b/modules/home/opencode/default.nix
index 1d9dfb4..86c7176 100644
--- a/modules/home/opencode/default.nix
+++ b/modules/home/opencode/default.nix
@@ -1,12 +1,21 @@
 { config, flake, pkgs, ... }:
 {
-  imports = [ flake.inputs.oc.homeModules.default ];
-  programs.opencode.package = flake.inputs.oc.packages.${pkgs.stdenv.hostPlatform.system}.default;
+  imports = [
+    flake.inputs.oc.homeModules.default
+    flake.inputs.AI.homeManagerModules.opencode
+  ];
+
+  programs.opencode = {
+    package = flake.inputs.oc.packages.${pkgs.stdenv.hostPlatform.system}.default;
+    autoWire.dir = flake.inputs.AI;
+  };
 
   programs.zsh.initContent = ''
     export JUSPAY_API_KEY="$(cat "${config.age.secrets.juspay-anthropic-api-key.path}")"
+    export OPENCODE_DISABLE_CLAUDE_CODE=1
   '';
   programs.bash.initExtra = ''
     export JUSPAY_API_KEY="$(cat "${config.age.secrets.juspay-anthropic-api-key.path}")"
+    export OPENCODE_DISABLE_CLAUDE_CODE=1
   '';
 }
diff --git a/vendor/AI b/vendor/AI
deleted file mode 160000
index 2f02c94..0000000
--- a/vendor/AI
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2f02c943cae209118ac501bb759df5ce09e13e09