diff --git a/hosts/glyph/home.nix b/hosts/glyph/home.nix
index 538c66b7..1a3d4150 100644
--- a/hosts/glyph/home.nix
+++ b/hosts/glyph/home.nix
@@ -9,6 +9,7 @@
 
   programs.opencode = {
     enable = true;
+    enableMcpIntegration = true;
     web.enable = true;
     web.extraArgs = ["--port" "8890" "--hostname" "0.0.0.0"];
     rules = builtins.readFile "${llm-profile}/README.md";
@@ -22,10 +23,6 @@
         port = 8890;
         hostname = "0.0.0.0";
       };
-      mcp.glyph = {
-        type = "remote";
-        url = "http://127.0.0.1:8090/mcp";
-      };
     };
   };
 
diff --git a/modules/home/development.nix b/modules/home/development.nix
index 61891882..b531c758 100644
--- a/modules/home/development.nix
+++ b/modules/home/development.nix
@@ -27,15 +27,17 @@ in {
 
   config = lib.mkMerge [
     (mkIf cfg.ai.enable {
+      programs.mcp = {
+        enable = true;
+        servers.glyph = {
+          url = "http://glyph:8090/mcp";
+        };
+      };
+
       programs.claude-code = {
         enable = true;
+        enableMcpIntegration = true;
         memory.source = "${llm-profile}/README.md";
-        mcpServers = {
-          glyph = {
-            type = "http";
-            url = "http://glyph:8090/mcp";
-          };
-        };
         settings = {
           model = "sonnet";
           # Disabled in favor of Basic Memory MCP for cross-device access