Due to Tax Reform, federal law limits moving expense deductions to members of the Armed Forces on active duty, but, California allows you to deduct work-related moving expenses subject to distance and time requirements. Yes, on the 2018 CA return, you will treat your moving expenses as non-reimbursed.  

Another result of the new tax changes is that moving expenses reimbursed by your employer will be fully taxable and should be included in Box 1 of your 2019 W-2.  There is nothing you need to do to "correct in 2019".

See https://www.irs.gov/newsroom/tax-reform-brings-changes-to-qualified-moving-expenses for more information.