Index: tests/unified_locking/fast.cfa
===================================================================
--- tests/unified_locking/fast.cfa	(revision f7f07f6686cd624c02ff4a6810ca823591ac8122)
+++ tests/unified_locking/fast.cfa	(revision 8f1a99e18a889d2af43cbd1e5f77c6554f5c8009)
@@ -7,5 +7,5 @@
 struct MutexObj {
 	fast_lock l;
-	$thread * id;
+	thread$ * id;
 	uint32_t sum;
 };
@@ -21,5 +21,5 @@
 
 uint32_t cs() {
-	$thread * me = active_thread();
+	thread$ * me = active_thread();
 	uint32_t value;
 	lock(mo.l);
Index: tests/unified_locking/mcs.cfa
===================================================================
--- tests/unified_locking/mcs.cfa	(revision f7f07f6686cd624c02ff4a6810ca823591ac8122)
+++ tests/unified_locking/mcs.cfa	(revision 8f1a99e18a889d2af43cbd1e5f77c6554f5c8009)
@@ -7,5 +7,5 @@
 struct MutexObj {
 	mcs_lock l;
-	$thread * id;
+	thread$ * id;
 	size_t sum;
 };
@@ -21,5 +21,5 @@
 
 unsigned cs() {
-	$thread * me = active_thread();
+	thread$ * me = active_thread();
 	unsigned value = (unsigned)me;
 	mcs_node n;
Index: tests/unified_locking/thread_test.cfa
===================================================================
--- tests/unified_locking/thread_test.cfa	(revision f7f07f6686cd624c02ff4a6810ca823591ac8122)
+++ tests/unified_locking/thread_test.cfa	(revision 8f1a99e18a889d2af43cbd1e5f77c6554f5c8009)
@@ -40,10 +40,10 @@
     for (unsigned int i = 0; i < num_times; i++) {
         dowork(buffer, work_unlocked);
-        lock(curr_lock);
+        lock(*curr_lock);
         //printf("lock: %d %p ENTER\n", i, &curr_lock);
         //lock(norm_lock);
         dowork(buffer, work_locked);
         //printf("lock: %d %p LEAVE\n", i, &curr_lock);
-        unlock(curr_lock);
+        unlock(*curr_lock);
         //unlock(norm_lock);
         lck = rand() % lockCount;
@@ -65,5 +65,5 @@
             break;
         default:
-            break; 
+            break;
     }
 	processor p[threadCount];