diff --git a/src/Surface.zig b/src/Surface.zig
index 71d600fbe..e9b27f05a 100644
--- a/src/Surface.zig
+++ b/src/Surface.zig
@@ -21,7 +21,7 @@ const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
 const ArenaAllocator = std.heap.ArenaAllocator;
 const oni = @import("oniguruma");
-const ziglyph = @import("ziglyph");
+const unicode = @import("unicode/main.zig");
 const main = @import("main.zig");
 const renderer = @import("renderer.zig");
 const termio = @import("termio.zig");
@@ -1231,7 +1231,7 @@ pub fn preeditCallback(self: *Surface, preedit_: ?[]const u8) !void {
     var codepoints: std.ArrayListUnmanaged(Codepoint) = .{};
     defer codepoints.deinit(self.alloc);
     while (it.nextCodepoint()) |cp| {
-        const width = ziglyph.display_width.codePointWidth(cp, .half);
+        const width: usize = @intCast(unicode.table.get(cp).width);
 
         // I've never seen a preedit text with a zero-width character. In
         // theory its possible but we can't really handle it right now.
diff --git a/src/helpgen.zig b/src/helpgen.zig
index 5a9c40b25..2084fb9f7 100644
--- a/src/helpgen.zig
+++ b/src/helpgen.zig
@@ -3,7 +3,6 @@
 //! help, docs, website, etc.
 
 const std = @import("std");
-const ziglyph = @import("ziglyph");
 const Config = @import("config/Config.zig");
 const Action = @import("cli/action.zig").Action;
 const KeybindAction = @import("input/Binding.zig").Action;