Whether lock-in has bettered or worsened depends on perspective. While OS X can be shoehorned to run on Hackintoshes and VMs now, I can't remember any time when it was virtually impossible to install a custom operating system on Apple hardware until the iPhone came out (and, eventually, when the iPhone 3GS closed up the bugs that allowed the bootloader's security checks to be cirvumvented; said bugs were the only way to install a custom OS - like Android - on an iPhone). As far as I know, the software on Apple's desktops and laptops has always been unrestricted (as I know firsthand; literally all my PowerPC Mac hardware runs OpenBSD nowadays).