I plan to update my desktop to mac mini to the new generation. I also consider to replace the hard drive with a SSD. See Customized Core i7 Mac mini offers iMac-like performance for more information.
A Lenovo X201i is a great laptop for running OpenBSD on. The i variant also have a quite resonable price.