--- a/hgext/hgk.py
+++ b/hgext/hgk.py
@@ -86,7 +86,7 @@ def difftree(ui, repo, node1=None, node2
 
         change = repo.changelog.read(node1)
         mmap = repo.manifest.read(change[0])
-        empty = "0" * 40;
+        empty = hg.nullid
 
         for f in modified:
             # TODO get file permissions
@@ -94,12 +94,12 @@ def difftree(ui, repo, node1=None, node2
                                                       hg.short(mmap2[f]),
                                                       f, f)
         for f in added:
-            print ":000000 100664 %s %s N\t%s\t%s" % (empty,
+            print ":000000 100664 %s %s N\t%s\t%s" % (hg.short(nullid),
                                                       hg.short(mmap2[f]),
                                                       f, f)
         for f in removed:
             print ":100664 000000 %s %s D\t%s\t%s" % (hg.short(mmap[f]),
-                                                      empty,
+                                                      hg.short(nullid),
                                                       f, f)
     ##