To change the default boot partition, boot to OS X by holding down the "Option" key. Once OS X has loaded, go to your System Preferences. Under the "Startup Disk" options, change the Startup Disk to your OS X partition. Once that is set, OS X will, once again, become the default OS at boot.