diff --git a/repos/base-hw/src/core/kernel/kernel.cc b/repos/base-hw/src/core/kernel/kernel.cc
index 43b22012f1..608fd9dddd 100644
--- a/repos/base-hw/src/core/kernel/kernel.cc
+++ b/repos/base-hw/src/core/kernel/kernel.cc
@@ -17,6 +17,17 @@
 #include <kernel/lock.h>
 #include <kernel/kernel.h>
 
+namespace Kernel {
+
+	time_t read_idle_thread_execution_time(unsigned cpu_idx);
+}
+
+
+Kernel::time_t Kernel::read_idle_thread_execution_time(unsigned cpu_idx)
+{
+	return cpu_pool().cpu(cpu_idx).idle_thread().execution_time();
+}
+
 
 extern "C" void kernel()
 {
diff --git a/repos/base-hw/src/core/platform.cc b/repos/base-hw/src/core/platform.cc
index 663acd8835..4f42d9c8a4 100644
--- a/repos/base-hw/src/core/platform.cc
+++ b/repos/base-hw/src/core/platform.cc
@@ -22,13 +22,12 @@
 #include <platform_pd.h>
 #include <hw/page_flags.h>
 #include <hw/util.h>
-#include <kernel/kernel.h>
 #include <translation_table.h>
-#include <kernel/cpu.h>
 
 /* base-internal includes */
 #include <base/internal/crt0.h>
 #include <base/internal/stack_area.h>
+#include <base/internal/unmanaged_singleton.h>
 
 /* Genode includes */
 #include <base/log.h>
@@ -36,6 +35,11 @@
 
 using namespace Genode;
 
+namespace Kernel {
+
+	time_t read_idle_thread_execution_time(unsigned cpu_idx);
+}
+
 
 /**************
  ** Platform **
@@ -216,14 +220,13 @@ Platform::Platform()
 		init_core_log(Core_log_range { core_local_addr, log_size } );
 	}
 
-	class Trace_source : public  Trace::Source::Info_accessor,
-	                     private Trace::Control,
-	                     private Trace::Source
+	class Idle_thread_trace_source : public  Trace::Source::Info_accessor,
+	                                 private Trace::Control,
+	                                 private Trace::Source
 	{
 		private:
 
-			Kernel::Thread           &_thread;
-			Affinity::Location const  _affinity;
+			Affinity::Location const _affinity;
 
 		public:
 
@@ -233,18 +236,18 @@ Platform::Platform()
 			Info trace_source_info() const override
 			{
 				Trace::Execution_time execution_time {
-					_thread.execution_time(), 0 };
+					Kernel::read_idle_thread_execution_time(
+						_affinity.xpos()), 0 };
 
-				return { Session_label("kernel"), _thread.label(),
+				return { Session_label("kernel"), "idle",
 				         execution_time, _affinity };
 			}
 
-			Trace_source(Trace::Source_registry &registry,
-			             Kernel::Thread &thread, Affinity::Location affinity)
+			Idle_thread_trace_source(Trace::Source_registry &registry,
+			                         Affinity::Location affinity)
 			:
 				Trace::Control { },
 				Trace::Source  { *this, *this },
-				_thread        { thread },
 				_affinity      { affinity }
 			{
 				registry.insert(this);
@@ -252,10 +255,12 @@ Platform::Platform()
 	};
 
 	/* create trace sources for idle threads */
-	Kernel::cpu_pool().for_each_cpu([&] (Kernel::Cpu & cpu) {
-		new (core_mem_alloc()) Trace_source(Trace::sources(), cpu.idle_thread(),
-		                                    Affinity::Location(cpu.id(), 0));
-	});
+	for (unsigned cpu_idx = 0; cpu_idx < _boot_info().cpus; cpu_idx++) {
+
+		new (core_mem_alloc())
+			Idle_thread_trace_source(
+				Trace::sources(), Affinity::Location(cpu_idx, 0));
+	}
 
 	log(_rom_fs);
 }