Index: src/OFObject.m
==================================================================
--- src/OFObject.m
+++ src/OFObject.m
@@ -665,18 +665,17 @@
 			IMP implementation;
 
 			/*
 			 * Don't replace methods implemented in receiving class.
 			 */
-			if ([self instanceMethodForSelector: selector] !=
-			    [superclass instanceMethodForSelector: selector])
+			if ([self methodForSelector: selector] !=
+			    [superclass methodForSelector: selector])
 				continue;
 
-			implementation =
-			    [class instanceMethodForSelector: selector];
+			implementation = [class methodForSelector: selector];
 
-			if ([self instancesRespondToSelector: selector])
+			if ([self respondsToSelector: selector])
 				     [self setImplementation: implementation
 					      forClassMethod: selector];
 			else {
 				const char *typeEncoding =
 				    methodList->method_list[i].method_types;