Index: libcfa/src/concurrency/kernel.cfa
===================================================================
--- libcfa/src/concurrency/kernel.cfa	(revision 16fd826a3bf8c266056376651e653e5ea88cbc89)
+++ libcfa/src/concurrency/kernel.cfa	(revision fb4ccdff4d341a021e459822bffec5455126b331)
@@ -265,5 +265,4 @@
 			SEARCH: {
 				/* paranoid */ verify( ! __preemption_enabled() );
-				/* paranoid */ verify( kernelTLS().this_proc_id );
 
 				// First, lock the scheduler since we are searching for a thread
@@ -323,5 +322,5 @@
 				}
 
-				__STATS( if(this->print_halts) __cfaabi_bits_print_safe( STDOUT_FILENO, "PH:%d - %lld 0\n", this->id, rdtscl()); )
+					__STATS( if(this->print_halts) __cfaabi_bits_print_safe( STDOUT_FILENO, "PH:%d - %lld 0\n", this->unique_id, rdtscl()); )
 				__cfadbg_print_safe(runtime_core, "Kernel : core %p waiting on eventfd %d\n", this, this->idle);
 
@@ -331,5 +330,5 @@
 				// __enable_interrupts_hard();
 
-				__STATS( if(this->print_halts) __cfaabi_bits_print_safe( STDOUT_FILENO, "PH:%d - %lld 1\n", this->id, rdtscl()); )
+					__STATS( if(this->print_halts) __cfaabi_bits_print_safe( STDOUT_FILENO, "PH:%d - %lld 1\n", this->unique_id, rdtscl()); )
 
 				// We were woken up, remove self from idle
@@ -341,5 +340,4 @@
 
 		RUN_THREAD:
-			/* paranoid */ verify( kernelTLS().this_proc_id );
 			/* paranoid */ verify( ! __preemption_enabled() );
 			/* paranoid */ verify( readyThread );