diff --git a/metropolis/cli/metroctl/cmd_node.go b/metropolis/cli/metroctl/cmd_node.go
index d7a23ee..30dd965 100644
--- a/metropolis/cli/metroctl/cmd_node.go
+++ b/metropolis/cli/metroctl/cmd_node.go
@@ -17,7 +17,6 @@
 
 	"source.monogon.dev/go/clitable"
 	"source.monogon.dev/metropolis/cli/metroctl/core"
-	"source.monogon.dev/metropolis/node/core/identity"
 	"source.monogon.dev/version"
 
 	apb "source.monogon.dev/metropolis/proto/api"
@@ -154,13 +153,12 @@
 
 		for _, n := range nodes {
 			// Filter the information we want client-side.
-			nid := identity.NodeID(n.Pubkey)
 			if len(qids) != 0 {
-				if _, e := qids[nid]; !e {
+				if _, e := qids[n.Id]; !e {
 					continue
 				}
 			}
-			if excludedNodes[nid] {
+			if excludedNodes[n.Id] {
 				continue
 			}
 
@@ -450,8 +448,7 @@
 	for _, n := range nodes {
 		// Filter the information we want client-side.
 		if len(qids) != 0 {
-			nid := identity.NodeID(n.Pubkey)
-			if _, e := qids[nid]; !e {
+			if _, e := qids[n.Id]; !e {
 				continue
 			}
 		}