diff --git a/src/thread/thread.c b/src/thread/thread.c
index 2812288..59d2813 100644
--- a/src/thread/thread.c
+++ b/src/thread/thread.c
@@ -75,7 +75,7 @@ int thread_yield(void)
     if (!IS_FINISHED(running) && !IS_WAITING(running)) {
         TAILQ_INSERT_TAIL(&head, running, link);
     }
-    TRACE("PICKING %p (previous was %p)", first->id, running->id);
+    TRACE("PICKING %p (previous was %p)", first, running);
     // Switch to the new thread.
     struct context_entry* old_runner = running;
     running = first;
@@ -146,7 +146,7 @@ int thread_create(thread_t* newthread, void* (*func)(void*), void* funcarg)
 
 void print_entry(struct context_entry* entry)
 {
-    TRACE("CONTEXT (%p, %p, %d);", entry, entry->id, WAS_ALLOCATED(entry));
+    TRACE("CONTEXT (%p, %p, %d);", entry, entry, WAS_ALLOCATED(entry));
 }
 
 int thread_join(thread_t thread, void** retval)