--- a/dstep/foundation/NSDistributedLock.d	Mon Aug 03 15:31:48 2009 +0200
+++ b/dstep/foundation/NSDistributedLock.d	Sun Jan 03 22:06:11 2010 +0100
@@ -8,16 +8,27 @@
 
 import dstep.foundation.NSDate;
 import dstep.foundation.NSObject;
+import dstep.foundation.NSString;
 import dstep.objc.bridge.Bridge;
-import dstep.objc.objc : id;
+import dstep.objc.objc;
 
 class NSDistributedLock : NSObject
 {
-	mixin ObjcWrap;
+	mixin (ObjcWrap);
+	
+	this ()
+	{
+		super(typeof(this).alloc.init.objcObject);
+	}
+	
+	typeof(this) init ()
+	{
+		return invokeObjcSelf!(typeof(this), "init");
+	}
 
 	static NSDistributedLock lockWithPath (NSString path)
 	{
-		return invokeObjcSelfClass!(NSDistributedLock, "lockWithPath:", NSString)(path);
+		return invokeObjcSuperClass!(NSDistributedLock, "lockWithPath:", NSString)(path);
 	}
 
 	Object initWithPath (NSString path)
@@ -27,13 +38,7 @@
 
 	this (NSString path)
 	{
-		objcObject = Bridge.invokeObjcClassMethod!(id, "alloc")(objcClass);
-		id result = Bridge.invokeObjcMethod!(id, "initWithPath:", NSString)(objcObject, path);
-
-		if (result)
-			objcObject = ret;
-
-		dObject = this;
+		typeof(this).alloc.initWithPath(path);
 	}
 
 	bool tryLock ()