@@ -14,35 +14,35 @@
 #import <stdlib.h>
 
 #import "OFListObject.h"
 
 @implementation OFListObject
-+ newWithData: (void*)ptr
++ newWithData: (id)obj
 {
-	return [[self alloc] initWithData: ptr];
+	return [[self alloc] initWithData: obj];
 }
 
-- initWithData: (void*)ptr
+- initWithData: (id)obj
 {
 	if ((self = [super init])) {
 		next = nil;
 		prev = nil;
-		data = ptr;
+		data = obj;
 	}
 
 	return self;
 }
 
 - freeIncludingData
 {
-	if (data != NULL)
-		free(data);
+	if (data != nil)
+		[data free];
 
 	return [super free];
 }
 
-- (void*)data
+- (id)data
 {
 	return data;
 }
 
 - (OFListObject*)next