diff --git a/build.zig b/build.zig
index 2b3a149..e287604 100644
--- a/build.zig
+++ b/build.zig
@@ -14,10 +14,7 @@ pub fn build(b: *std.Build) void {
         .optimize = optimize,
     });
 
-    const tree_sitter_host_dep = b.dependency("tree_sitter", .{
-        .target = b.graph.host,
-        .optimize = optimize,
-    });
+    const tree_sitter_host_dep = b.dependency("tree_sitter", .{});
 
     const cbor_dep = b.dependency("cbor", .{
         .target = target,
@@ -26,8 +23,11 @@ pub fn build(b: *std.Build) void {
 
     const ts_bin_query_gen = b.addExecutable(.{
         .name = "ts_bin_query_gen",
-        .target = b.graph.host,
-        .root_source_file = b.path("src/ts_bin_query_gen.zig"),
+        .root_module = b.createModule(.{
+            .root_source_file = b.path("src/ts_bin_query_gen.zig"),
+            .target = target,
+            .optimize = optimize,
+        }),
     });
     ts_bin_query_gen.linkLibC();
     ts_bin_query_gen.root_module.addImport("cbor", cbor_dep.module("cbor"));
diff --git a/build.zig.zon b/build.zig.zon
index 70ca5d8..218a167 100644
--- a/build.zig.zon
+++ b/build.zig.zon
@@ -6,12 +6,12 @@
 
     .dependencies = .{
         .tree_sitter = .{
-            .url = "https://github.com/neurocyte/tree-sitter/releases/download/master-1c3ad59bd98ee430b166054030dac4c46d641e39/source.tar.gz",
-            .hash = "N-V-__8AANMzUiemOR2eNnrtlMmAGHFqij6VYtDUiaFfn6Dw",
+            .url = "https://github.com/neurocyte/tree-sitter/releases/download/master-f1f032d24f621e2ee4deab1c424d3bf9fb809f6e/source.tar.gz",
+            .hash = "tree_sitter-0.22.4-150-g7e3f5726-z0LhyN88UicDHlr22vQnOZ3DW9NWN1gOhDwLuCRXvrh2",
         },
         .cbor = .{
-            .url = "https://github.com/neurocyte/cbor/archive/1fccb83c70cd84e1dff57cc53f7db8fb99909a94.tar.gz",
-            .hash = "cbor-1.0.0-RcQE_HvqAACcrLH7t3IDZOshgY2xqJA_UX330MvwSepb",
+            .url = "git+https://github.com/neurocyte/cbor#6eccce0b984296e7d05c20d83933cb31530e4fac",
+            .hash = "cbor-1.0.0-RcQE_N3yAADXjbyvhsmTQ6lf22l1nYgePq5FT8NaC4ic",
         },
     },
     .paths = .{