diff --git a/src/lib/imd_cbmem.c b/src/lib/imd_cbmem.c
index cb66c3b..7638e0e 100644
--- a/src/lib/imd_cbmem.c
+++ b/src/lib/imd_cbmem.c
@@ -178,7 +178,7 @@
 
 u64 cbmem_entry_size(const struct cbmem_entry *entry)
 {
-	return imd_entry_size(&imd, cbmem_to_imd(entry));
+	return imd_entry_size(cbmem_to_imd(entry));
 }
 
 void *cbmem_entry_start(const struct cbmem_entry *entry)
@@ -232,7 +232,7 @@
 		if (e == NULL)
 			break;
 
-		id = imd_entry_id(&imd, e);
+		id = imd_entry_id(e);
 		/* Don't add these metadata entries. */
 		if (id == CBMEM_ID_IMD_ROOT || id == CBMEM_ID_IMD_SMALL)
 			continue;
@@ -241,7 +241,7 @@
 		lbe->tag = LB_TAG_CBMEM_ENTRY;
 		lbe->size = sizeof(*lbe);
 		lbe->address = (uintptr_t)imd_entry_at(&imd, e);
-		lbe->entry_size = imd_entry_size(&imd, e);
+		lbe->entry_size = imd_entry_size(e);
 		lbe->id = id;
 	}
 }