@@ -18,11 +18,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ObjFW/ObjFW.h>
+@import ObjFW;
 
 #import "SiteStorage.h"
 
 @interface SiteStorage ()
 - (void)_update;
@@ -31,13 +31,13 @@
 static OFNumber *lengthField, *legacyField, *keyFileField;
 
 @implementation SiteStorage
 + (void)initialize
 {
-	lengthField = [@(UINT8_C(0)) retain];
-	legacyField = [@(UINT8_C(1)) retain];
-	keyFileField = [@(UINT8_C(2)) retain];
+	lengthField = [[OFNumber alloc] initWithUInt8: 0];
+	legacyField = [[OFNumber alloc] initWithUInt8: 1];
+	keyFileField = [[OFNumber alloc] initWithUInt8: 2];
 }
 
 - (instancetype)init
 {
 	self = [super init];
@@ -153,12 +153,12 @@
 {
 	@autoreleasepool {
 		OFMutableDictionary *siteDictionary =
 		    [OFMutableDictionary dictionary];
 
-		siteDictionary[lengthField] = @(length);
-		siteDictionary[legacyField] = @(legacy);
+		siteDictionary[lengthField] = [OFNumber numberWithSize: length];
+		siteDictionary[legacyField] = [OFNumber numberWithBool: legacy];
 		siteDictionary[keyFileField] = keyFile;
 
 		[siteDictionary makeImmutable];
 
 		_storage[site] = siteDictionary;