Nucleus

diff --git a/object/lock.c b/object/lock.c
index b3d2fb8..d7a7d11 100644
--- a/object/lock.c
+++ b/object/lock.c
@@ -15,7 +15,7 @@ holding(Spinlock *lock)
 {
 	if (current)
 		return (lock->locked && lock->owner == current);
-	return (lock->locked && lock->cpu == (CPUID + 1));
+	return (lock->locked && lock->cpu == (cpu->id + 1));
 }
 
 /* Initialise a lock */
@@ -44,7 +44,7 @@ acquire(Spinlock *lock)
 	if (current)
 		lock->owner = current;
 	else
-		lock->cpu = CPUID + 1;
+		lock->cpu = cpu->id + 1;
 }
 
 /* Release a lock */